set dy to page_size + height in the event dy + page_size is about to

2006-05-26  Kristian Rietveld  <kris@gtk.org>

	* gtk/gtktreeview.c (gtk_tree_view_top_row_to_dy): set dy to
	page_size + height in the event dy + page_size is about to become
	bigger than height.

diff --git a/ChangeLog b/ChangeLog
index 40537fcceb42d9cacc10cddb12b6bcdcd0787070..9849194f4e83e3b9838a134bd6def2a44442a2bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-26  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_top_row_to_dy): set dy to
+       page_size + height in the event dy + page_size is about to become
+       bigger than height.
+
 2006-05-25  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtk.symbols:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 40537fcceb42d9cacc10cddb12b6bcdcd0787070..9849194f4e83e3b9838a134bd6def2a44442a2bc 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-05-26  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_top_row_to_dy): set dy to
+       page_size + height in the event dy + page_size is about to become
+       bigger than height.
+
 2006-05-25  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtk.symbols:

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 54d166c9c526f3db82f58704998f24c692436ec5..5e00ccbaee0b23a3e8472cb18eb238f304d7b22e 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -5614,6 +5614,10 @@ gtk_tree_view_top_row_to_dy (GtkTreeView *tree_view)
 
   tree_view->priv->dy = _gtk_rbtree_node_find_offset (tree, node);
   tree_view->priv->dy += tree_view->priv->top_row_dy;
+
+  if (tree_view->priv->dy + tree_view->priv->vadjustment->page_size > tree_view->priv->height)
+    tree_view->priv->dy = tree_view->priv->height - tree_view->priv->vadjustment->page_size;
+
   gtk_adjustment_set_value (tree_view->priv->vadjustment,
                            (gdouble)tree_view->priv->dy);
 }